4c91fd69aeeb243e0b7b8bb3dfd145ab54a5d5dd,opennms-webapp/src/main/java/org/opennms/web/controller/ksc/CustomViewController.java,CustomViewController,handleRequestInternal,#HttpServletRequest#HttpServletResponse#,87

Before Change


      
        // Get the list of available prefabricated graph options 
        Set<PrefabGraph> prefabGraphs = new TreeSet<PrefabGraph>();
        if (!report.getGraphCollection().isEmpty()) {
            for (Graph graph : report.getGraphCollection()) {
                OnmsResource resource = getKscReportService().getResourceFromGraph(graph);
                if (resource == null) {
                    log().debug("Could not get resource for graph " + graph + " in report " + report.getTitle());
                } else {

After Change


        }
      
        // Get the list of available prefabricated graph options 
        HashMap<String, OnmsResource> resourceMap = new HashMap<String, OnmsResource>();
        Set<PrefabGraph> prefabGraphs = new TreeSet<PrefabGraph>();
        List<Graph> graphCollection = report.getGraphCollection();
        if (!graphCollection.isEmpty()) {
            List<OnmsResource> resources = getKscReportService().getResourcesFromGraphs(graphCollection);
            for (int i = 0; i < graphCollection.size(); i++) {
                Graph graph = graphCollection.get(i);
                OnmsResource resource = resources.get(i);
                resourceMap.put(graph.toString(), resource);
                if (resource == null) {
                    log().debug("Could not get resource for graph " + graph + " in report " + report.getTitle());
                } else {
                    prefabGraphs.addAll(Arrays.asList(getResourceService().findPrefabGraphsForResource(resource)));
                }
            }
      
            // Get default graph type from first element of graph_options
            // XXX Do we care about the tests on reportType?
            if (("node".equals(reportType) || "domain".equals(reportType))
                    && overrideGraphType == null
                    && !prefabGraphs.isEmpty()) {
                // Get the name of the first item.  prefabGraphs is sorted.
                overrideGraphType = prefabGraphs.iterator().next().getName();
                if (log().isDebugEnabled()) {
                    log().debug("custom_view: setting default graph type to " + overrideGraphType);
                }
            }
        }
        
        List<KscResultSet> resultSets = new ArrayList<KscResultSet>(report.getGraphCount());
        for (Graph graph : graphCollection) {
            OnmsResource resource = resourceMap.get(graph.toString());
            if (resource != null) {
                promoteResourceAttributesIfNecessary(resource);
            }